Skip to content

ug mcp login: per-service sign-in status + login for agents' MCP services - #654

Open
sunishsheth2009 wants to merge 12 commits into
databricks:mainfrom
sunishsheth2009:mcp-login-command
Open

sunishsheth2009 wants to merge 12 commits into
databricks:mainfrom
sunishsheth2009:mcp-login-command

Conversation

@sunishsheth2009

@sunishsheth2009 sunishsheth2009 commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Stacked on #557 (mcp-proxy: drive per-connection login on a 401). Merge #557 first, then this. Both target main, so until #557 merges this PR's diff also shows #557's commits (connection_from_url, run_connection_login, the shared mcp_connection_login module). Once #557 lands, this reduces to just the ug mcp login command.

What

Adds ug mcp login — sign in to the connection-backed AI Gateway MCP services the coding agents are configured to use. Shows which are already signed in vs. need a per-user connection sign-in, and runs the sign-in for the ones you pick (interactive picker) or name with --names / scope with --agents.

Why

Non-native agents (codex, gemini, opencode) reach connection-backed MCP services (e.g. system.ai.github) via ug mcp-proxy, which vends tools only after a per-user connection login. #557 makes the proxy drive that login transparently on a 401; this command is the explicit companion — check status and pre-sign-in from your own shell, before an agent ever connects. It also works for Claude/Cursor — the credential is per-user and shared across all agents, so signing in once unblocks the service everywhere.

Reuses the shared code (no duplication with #557)

How status works (existing UC REST APIs — no unshipped deps)

  • GET /mcp-services/<full-name> → id + source_connection (name + securable_kind)
  • GET /connections/<conn>/user-credentials/<user>?dependent.mcp_service.id=<id>provisioning_info.state (ACTIVE = signed in; HTTP 404 = needs login)

Works for any connection-backed MCP service — not just system.ai.* (source connection resolved from the service's own config).

UX (symmetric with ug mcp add)

  • bare ug mcp login → status table + picker (needs-sign-in pre-checked)
  • --names system.ai.github[,github] → targeted, non-interactive
  • --agents claude,codex → scope to those agents' services

Status renders with the same rich Table + status_badge styling as ug mcp list.

Testing

tests/test_mcp_login.py — status classification and --names/--agents scoping incl. workspace-managed and OS-managed-file inclusion (the run_connection_login / connection_from_url unit tests live with their module in #557). tests/test_mcp.pyconfigured_mcp_servers_by_name merge/scope + the managed-file read. ruff + ty clean; the mcp/login/cli suite is green (the one pre-existing failure, test_single_codex_agent_passes_managed_parent_directly, auto-updates codex mid-test and fails on main too).

Example output

ug mcp login (real output) — the status table, then an interactive checklist (needs-sign-in pre-checked):

╭───────────╮
│ MCP login │
╰───────────╯
  Workspace: https://eng-ml-inference.staging.cloud.databricks.com

Connection-backed MCP services
MCP SERVICE       AGENTS         SIGN-IN
system.ai.github  claude, codex  needs sign-in

? Sign in to MCP services (space to toggle, enter to confirm):
 ❯ ◉ system.ai.github  (needs sign-in)

Non-interactive form, ug mcp login --names system.ai.github, signs in to the named service(s) directly (no picker), and prints signed in on success.

This pull request and its description were written by Isaac.

Test evidence

Local run on b8a2b02 (the pushed head, rebased on latest main): lint, type-check, and the ug mcp login suite plus the shared-enumeration suite all green. CI on this PR is also green (Unit tests, Agent launch tests for all six agents, Gateway API, Integration/Installation).

### ruff check       → All checks passed!
### ty typecheck     → All checks passed!

### pytest tests/test_mcp_login.py
============================= test session starts ==============================
platform linux -- Python 3.12.13, pytest-9.1.1
============================== 11 passed in 0.76s ==============================

### pytest tests/test_mcp_login.py tests/test_mcp.py
============================= 216 passed in 1.13s ==============================
All 16 ug mcp login tests (click to expand)
TestLoginStatus (per-service status from the UC REST APIs):
  test_authenticated_when_credential_active       # ACTIVE → signed in
  test_needs_login_on_404_not_found               # 404 → needs login
  test_needs_login_when_state_not_active          # PROVISIONING → needs login
  test_no_login_needed_for_non_oauth_kind         # non-OAuth-U2M connection
  test_unknown_when_details_error                 # mcp-services error → unknown
  test_unknown_when_credential_error_not_404      # 403 etc. → unknown, not authed
TestLoginCommand (orchestration + scoping):
  test_services_targets_only_named_and_logs_in    # --names, short-name match
  test_agents_scope_excludes_unconfigured_agent   # --agents scoping
  test_no_configured_services_is_noop
  test_workspace_managed_service_is_included      # workspace-managed mcp-services
  test_os_managed_file_service_is_included        # #717 OS-managed-file servers

The run_connection_login / connection_from_url unit tests (the --resource invocation, stderr routing, old-CLI error, FQN parsing) live with their module in #557's tests/test_mcp_connection_login.py — not duplicated here.

@sunishsheth2009
sunishsheth2009 force-pushed the mcp-login-command branch 5 times, most recently from 0b050e9 to 5c6bd73 Compare September 20, 2026 19:47
@sunishsheth2009
sunishsheth2009 marked this pull request as ready for review September 20, 2026 19:47
sunishsheth2009 added a commit to sunishsheth2009/ucode that referenced this pull request Sep 23, 2026
…gin`

Drop the proxy-specific `ucode mcp-proxy:` prefix from the connect-time
sign-in message so `run_connection_login` / `connection_from_url` can be reused
verbatim by `ug mcp login` (PR databricks#654), which stacks on this one. Behavior is
unchanged for the proxy.

Co-authored-by: Isaac <no-reply@databricks.com>

@xsh310 xsh310 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few correctness notes inline on the new ug mcp login code (the changes on top of #557).

Comment thread src/ucode/mcp_login.py Outdated
Comment thread src/ucode/mcp_login.py Outdated
Comment thread src/ucode/mcp_login.py Outdated
Comment thread src/ucode/mcp_login.py Outdated
sunishsheth2009 and others added 11 commits September 23, 2026 20:49
Give every coding agent a working login flow for connection-backed AI Gateway
mcp-services endpoints, done in the stdio proxy every agent already spawns — no
new library (cf. mcp-remote) and no per-agent OAuth app.

When AI Gateway has no per-user connection credential it answers with HTTP 401
(RFC 9728). The proxy's httpx auth hook already sees every response, so on a 401
for a connection-backed URL it runs the Databricks CLI U2M login with an RFC 8707
resource indicator (`databricks auth login --resource <mcp-url>`, using the CLI's
own registered redirect — no --client-id), then retries with a fresh token. A
resource-aware /oidc drives the connection's SaaS login before minting the token,
so the retry succeeds — transparently to the agent, which just sees the request
authenticate rather than a failed tools/list. A later credential revoke re-triggers
the login on the next 401.

New module mcp_connection_login holds connection_from_url + run_connection_login;
mcp_proxy._build_token_auth gains the login-on-401 retry. Unit-tested. Depends on
the CLI --resource flag (databricks/cli#6621) and /oidc resource handling (login).

Co-authored-by: Isaac <no-reply@databricks.com>
Fixes the two defects that made the proxy hang "connecting…" on a 401 instead
of behaving like a generic OAuth MCP bridge (mcp-remote):

1. Non-blocking: the browser login ran via a synchronous subprocess inside the
   sync httpx auth_flow, which the async client executes on the event-loop
   thread — freezing the transport (stdio pumps included) for the whole login.
   Add async_auth_flow that offloads run_connection_login to a worker thread
   (anyio.to_thread.run_sync), so the loop stays responsive and cancellable
   while the user completes the browser flow. sync auth_flow kept for parity;
   both share the decision + login logic.

2. Visible URL: run_connection_login captured the CLI's output, hiding the
   authorize URL. Route the CLI's stdout+stderr to the proxy's stderr (fd 2,
   the agent's MCP log) — never fd 1 (the JSON-RPC wire) — and let the CLI open
   the browser, so the login is discoverable exactly like mcp-remote's.

Co-authored-by: Isaac <no-reply@databricks.com>
Makes the generic proxy behave like a generic OAuth MCP bridge (mcp-remote): the
connection login happens while the agent shows "connecting…", and the browser
opens on its own — instead of racing the agent's tools/list timeout or burying
the URL.

- Connect-time login: before opening the bridge, serve() probes the connection
  (_connection_login_required: a lightweight initialize + tools/list to AI
  Gateway); on a 401 it drives run_connection_login *then*, so the agent's
  session comes up already authenticated. The on-401 retry in the auth hook
  stays as a mid-session fallback (credential revoked while connected). PAT
  profiles skip it (no connection OAuth).
- Browser auto-open: the login inherits the environment (incl. $BROWSER), so
  databricks-cli opens the browser on the user's machine; the authorize URL is
  the printed fallback.

Co-authored-by: Isaac <no-reply@databricks.com>
… the probe

Simplify to what a generic OAuth MCP bridge (mcp-remote) does: authenticate at
connect, then serve. Before opening the bridge, serve() runs a blocking
`databricks auth login --resource <mcp-url>` for connection-backed services —
the databricks-cli equivalent of mcp-remote's in-process OAuth, where --resource
also routes /oidc through the connection sign-in (/mcp-service-login). The agent
blocks on "connecting…" while it runs (browser opens via $BROWSER, or the URL is
printed), then the session comes up authenticated, so AI Gateway is never asked
to elicit a login. Idempotent: once signed in it returns immediately.

Removes the redundant startup probe (Claude already fires initialize+tools/list;
the proxy shouldn't duplicate that) and the on-401 retry inside the auth hook
(the connect-time login makes it unnecessary). _build_token_auth is back to a
plain per-request bearer read of the session that login established.

Co-authored-by: Isaac <no-reply@databricks.com>
The connect-time connection login runs `databricks auth login --resource`; an
older CLI without databricks/cli#6621 rejects the flag and the login exits with
a cryptic parse error (seen as a bare "connection closed" in the agent). Add a
one-time `auth login --help` pre-check and, when `--resource` is absent, return a
clear "upgrade your Databricks CLI" message instead of attempting the doomed
login. Fail-open if --help can't run.

Co-authored-by: Isaac <no-reply@databricks.com>
…lly missing

The connect-time login ran `databricks auth login --resource` unconditionally on
every proxy startup for every connection-backed server. But `databricks auth
login` always re-runs the browser OAuth (it does not short-circuit on a cached
token), so N configured servers meant N browser windows on every session — and
concurrent `auth login` runs also race on the shared token cache.

Gate the login on the actual per-user credential state (new
`connection_credential_state`, using the same Unity Catalog REST APIs as `ug mcp
login`): only run the login when the credential is confirmed MISSING. When it is
already PRESENT — or the state can't be determined (UNKNOWN) or the connection
isn't OAuth-U2M (NO_LOGIN) — skip the browser entirely. `tools/list` still works
without the credential, so UNKNOWN fails safe rather than risking a spurious
browser. This makes repeat sessions open zero browsers and first sessions prompt
only for the servers genuinely needing a sign-in.

Co-authored-by: Isaac <no-reply@databricks.com>
… startup

The connect-time login blocked the bridge from opening until it finished. With N
configured connection-backed servers all missing their credential, an agent
spawns N proxies at once, each launches a blocking `databricks auth login`, and
they stall on browser flows / racing loopback ports until every one hits the
agent's MCP startup timeout — all N servers fail to start (observed with 5 on
Codex, all timing out at 120s).

Move the login into the httpx auth flow, triggered by a 401: the bridge opens
immediately (tools/list needs no credential and returns the full list), and
`databricks auth login --resource` runs only when a request actually gets a 401
— i.e. when a tool you invoke needs the per-user connection credential. So a
browser opens only for a service you use, one at a time; an already-signed-in
service never prompts; and startup never blocks. The login runs at most once per
session, off the event loop (async_auth_flow + anyio.to_thread) so the bridge's
pumps aren't starved. PAT profiles have no connection OAuth, so they skip it.

This drops the eager credential-state gate added in the previous commit (the
lazy 401 signal supersedes it) along with its UC-REST probe.

Co-authored-by: Isaac <no-reply@databricks.com>
…gin`

Drop the proxy-specific `ucode mcp-proxy:` prefix from the connect-time
sign-in message so `run_connection_login` / `connection_from_url` can be reused
verbatim by `ug mcp login` (PR databricks#654), which stacks on this one. Behavior is
unchanged for the proxy.

Co-authored-by: Isaac <no-reply@databricks.com>
… parse

Consolidate the AI Gateway mcp-services URL knowledge that had drifted into three
copies: the path-segment literal lived in databricks.py (URL building),
mcp.py (AIGW_MCP_SERVICES_PATH, URL-shape classification), and
mcp_connection_login.py (AIGW_MCP_SERVICES_SEGMENT, connection-backed detection).

Define AIGW_MCP_SERVICES_SEGMENT once in databricks.py (where the URL is built) and
import it into mcp.py and mcp_connection_login.py. Also reuse connection_from_url in
mcp._mcp_server_location instead of a parallel url.split(), so the URL -> FQN parse
lives in one place too. No behavior change (the parser additionally strips a trailing
slash/query, which is strictly more correct for the label).

Co-authored-by: Isaac <no-reply@databricks.com>
… nit)

Clearer name for the closure that drives the per-connection sign-in on a 401.

Co-authored-by: Isaac <no-reply@databricks.com>
`ug mcp login` shows which of the connection-backed AI Gateway MCP services the
coding agents are configured to use are already signed in vs. still need a
per-user connection sign-in, and runs the sign-in for the ones you pick
(interactive picker) or name with `--services` / scope with `--agents`.

Reuses databricks#679's building blocks: the developer + workspace-managed server
enumeration is extracted from `list_mcp_command` into a shared
`configured_mcp_servers_by_name` (behavior-preserving) that both `ug mcp list`
and `ug mcp login` call, and the status is rendered with the same rich Table +
`status_badge` styling from `ucode.ui`.

Per-service status comes from the existing Unity Catalog REST APIs (the ones the
`/mcp-service-login` page uses); sign-in is `databricks auth login --resource`
(RFC 8707, databricks/cli#6621), so it works for any connection-backed MCP
service, not just `system.ai.*`. The credential is per-user and shared across
agents, so signing in once unblocks the service for every agent.

Co-authored-by: Isaac <no-reply@databricks.com>
sunishsheth2009 added a commit that referenced this pull request Sep 23, 2026
…557)

> Dependency **merged**: `databricks auth login --resource` shipped in
databricks/cli#6763, so the connection sign-in works with a current
Databricks CLI. Rebased on `main`.
>
> **#654 (`ug mcp login`) is stacked on this** and reuses the
`mcp_connection_login` module introduced here (`connection_from_url`,
`run_connection_login`). Merge this first.

## What

Give **every** coding agent (codex, cursor, gemini, claude, …) a working
login flow for connection-backed AI Gateway `mcp-services` endpoints
(e.g. `system.ai.github`) — implemented in the `ug mcp-proxy` stdio
bridge every agent already spawns. No new library (this is what a
generic OAuth MCP bridge like
[`mcp-remote`](https://www.npmjs.com/package/mcp-remote) does, done in
ucode with the Databricks CLI), and no per-agent OAuth app.

## How — login is driven lazily, on a 401 (not eagerly at startup)

A connection-backed `mcp-services` endpoint needs a per-user connection
credential before its tools can be used; until then AI Gateway answers
with an RFC 9728 `401`. The proxy handles that inside its httpx `Auth`
hook:

1. The bridge comes up **immediately** — `tools/list` needs no
credential, so nothing blocks startup.
2. On the first request that gets a `401` from a connection-backed
service, the auth flow runs a **one-time** `databricks auth login
--resource <mcp-url>` and retries. The RFC 8707 `resource` indicator
makes a resource-aware `/oidc` route the browser through the
connection's own SaaS login (`/mcp-service-login`) before minting the
token. It uses the CLI's **own** default client + registered loopback
redirect — **no `--client-id`, no auth-side redirect change**.
3. The blocking login runs **off the event loop**
(`anyio.to_thread.run_sync` in `async_auth_flow`), so the bridge's other
pumps aren't starved while the user completes the sign-in. It fires at
most once per session; an already-signed-in service never prompts; PAT
profiles have no connection OAuth to drive and skip it entirely.

This is deliberately lazy: a browser opens only for a service whose tool
you actually call, one at a time — not N browsers at startup for every
configured server. The proxy never writes to stdout (the MCP JSON-RPC
wire); the CLI's prompts and authorize URL go to **stderr**, so a
headless/remote box still shows the URL to open manually.

## Why this shape (supersedes the earlier bridges in this PR's history)

Earlier iterations tried a proxy that faked a `sign_in` tool / rewrote
`tools/list`, and an **eager** connect-time login that ran a blocking
`databricks auth login` before opening the bridge. The eager form popped
a browser at every launch and, with N configured connection-backed
servers, opened N browsers at once and stalled the agent's MCP startup
until each timed out. Driving the login lazily on a real 401, off the
event loop, once per session, is the minimal generic realization and
matches how `mcp-remote` behaves.

## Dependencies

- **CLI `--resource`**: databricks/cli#6763 (merged). An older CLI
without the flag fails fast with a clear "upgrade your CLI" message.
- **`/oidc` resource-indicator handling (login §2)** +
**`/mcp-service-login` return_to (§3)** — the server side of this flow.
AI Gateway §1 (the 401) is already on staging.

## Scope

- Connection-backed mcp-services endpoints get the lazy login-on-401.
PAT profiles skip it (no connection OAuth to drive).
- Plain Databricks MCP services keep the existing transparent
per-request token-injection (no extra login).

## Tests

`test_mcp_connection_login` — connection-FQN parsing, and the CLI login
runner with the subprocess mocked (sends `--resource`/`--host` and no
`--client-id`; routes output to stderr; reports nonzero-exit, timeout,
and missing-binary; old-CLI clear error). `test_mcp_proxy` — the lazy
auth flow (no login when the response isn't a connection 401;
login-then-retry on a 401; login fires at most once; non-connection URLs
and `--use-pat` never log in). `uv run pytest tests/test_mcp*.py` green;
ruff + ty clean.

_This pull request and its description were written by Isaac._


## Test evidence

Local run on `c28a77b` (the pushed head, rebased on latest main): lint,
type-check, and the full proxy + connection-login suites all green. CI
on this PR is also green (Unit tests, Agent launch tests for all six
agents, Gateway API, Integration/Installation).

```
### ruff check       → All checks passed!
### ty typecheck     → All checks passed!

### pytest tests/test_mcp_connection_login.py tests/test_mcp_proxy.py
============================= test session starts ==============================
platform linux -- Python 3.12.13, pytest-9.1.1
collected 46 items

tests/test_mcp_connection_login.py ..........                            [ 21%]
tests/test_mcp_proxy.py ....................................             [100%]
============================== 46 passed in 1.31s ==============================
```

<details><summary>All 46 tests (click to expand)</summary>

```
TestConnectionFromUrl:
  test_plain_endpoint
  test_with_trailing_path_and_query
  test_non_aigw_url_is_none
  test_missing_service_is_none
TestRunConnectionLogin:
  test_success_sends_resource_and_host_without_client_id
  test_nonzero_exit_reports_failure
  test_output_is_routed_to_stderr_not_stdout
  test_timeout_is_reported
  test_binary_missing_is_reported
  test_old_cli_without_resource_flag_reports_clearly
test_mcp_proxy (SDK/httpx wiring):
  test_httpx_is_a_direct_runtime_dependency
  test_mcp_dependency_is_uncapped
  test_selected_httpx_matches_the_installed_mcp_sdk
  test_proxy_imports_the_streamable_http_client_shared_by_both_majors
TestDatabricksTokenAuth (the lazy login-on-401 core):
  test_injects_bearer_from_minted_token
  test_auth_is_an_instance_of_the_selected_httpx_auth
  test_calls_get_token_with_workspace_and_profile
  test_mints_a_fresh_token_per_request
  test_auth_flow_yields_the_same_request
  test_dead_auth_becomes_a_terminal_proxy_auth_error
  test_on_401_from_connection_service_runs_login_then_retries
  test_non_connection_401_is_not_retried
  test_success_response_never_logs_in
  test_login_runs_at_most_once_per_session
  test_use_pat_never_drives_connection_login
  test_login_failure_becomes_a_proxy_auth_error
  test_async_auth_flow_drives_login_on_401
TestPump / TestServe / TestPreflightToken:
  test_forwards_all_messages_in_order
  test_closes_destination_when_source_exhausts
  test_client_errors_are_forwarded
  test_upstream_errors_are_raised
  test_upstream_eof_is_an_error
  test_run_uses_mcp_http_defaults
  test_runs_the_bridge_with_parsed_args
  test_defaults_profile_none
  test_use_pat_exports_the_bearer_before_serving
  test_use_pat_without_a_resolvable_pat_exits_before_serving
  test_oauth_path_never_touches_pat
  test_preflights_auth_before_opening_the_bridge
  test_dead_auth_exits_fast_without_starting_the_bridge
  test_auth_expiring_mid_session_exits_with_the_actionable_message
  test_transport_failure_exits_with_a_one_line_message
  test_non_auth_failures_still_propagate
  test_passes_through_when_a_token_is_available
  test_surfaces_the_cli_error_message
  test_checks_the_same_workspace_and_profile_the_bridge_will_use
```
</details>

---------

Co-authored-by: Isaac <no-reply@databricks.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants